From 085bbe37d0018adad583f47f383fa2ac43de4571 Mon Sep 17 00:00:00 2001 From: "Jonathan S. Katz" Date: Sun, 21 Mar 2021 14:15:19 -0400 Subject: [PATCH 3/3] Add page with additional details about a CVE This page contains most information that may be found on 3rd party sites about a particular CVE, but with the benefit of being hosted on the PostgreSQL infrastructure. This does require inserting the CVE description into the website, which will include backporting the CVE descriptions throughout many existing CVEs, but the added benefit is that this information is available when we publish a release, vs. waiting for a 3rd party to publish the info. This patch also adds sitemap indexing for each of the CVE entries, and ensures the top-level CVE URL is in the sitemap. --- .../0003_add_security_patch_details.py | 20 ++++ pgweb/security/models.py | 5 +- pgweb/security/struct.py | 9 ++ pgweb/security/views.py | 33 ++++++- pgweb/urls.py | 1 + templates/security/details.html | 95 +++++++++++++++++++ templates/security/security.html | 4 +- 7 files changed, 162 insertions(+), 5 deletions(-) create mode 100644 pgweb/security/migrations/0003_add_security_patch_details.py create mode 100644 pgweb/security/struct.py create mode 100644 templates/security/details.html diff --git a/pgweb/security/migrations/0003_add_security_patch_details.py b/pgweb/security/migrations/0003_add_security_patch_details.py new file mode 100644 index 0000000..23acb72 --- /dev/null +++ b/pgweb/security/migrations/0003_add_security_patch_details.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.13 on 2018-11-12 16:37 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('security', '0002_cve_visible'), + ] + + operations = [ + migrations.AddField( + model_name='securitypatch', + name='details', + field=models.TextField(blank=True, help_text='Additional details about the security patch', null=True), + ), + ] diff --git a/pgweb/security/models.py b/pgweb/security/models.py index e82c7d4..208a9de 100644 --- a/pgweb/security/models.py +++ b/pgweb/security/models.py @@ -70,6 +70,7 @@ class SecurityPatch(models.Model): cvenumber = models.IntegerField(null=False, blank=False, db_index=True) detailslink = models.URLField(null=False, blank=True) description = models.TextField(null=False, blank=False) + details = models.TextField(blank=True, null=True, help_text="Additional details about the security patch") component = models.CharField(max_length=32, null=False, blank=False, help_text="If multiple components, choose the most critical one", choices=component_choices) versions = models.ManyToManyField(Version, through='SecurityPatchVersion') @@ -84,7 +85,9 @@ class SecurityPatch(models.Model): vector_a = models.CharField(max_length=1, null=False, blank=True, verbose_name="Availability Impact", choices=vector_choices['A']) legacyscore = models.CharField(max_length=1, null=False, blank=True, verbose_name='Legacy score', choices=(('A', 'A'), ('B', 'B'), ('C', 'C'), ('D', 'D'))) - purge_urls = ('/support/security/', ) + def purge_urls(self): + yield '/support/security/CVE-%s/' % self.cve + yield '/support/security/' def save(self, force_insert=False, force_update=False): # Calculate a number from the CVE, that we can use to sort by. We need to diff --git a/pgweb/security/struct.py b/pgweb/security/struct.py new file mode 100644 index 0000000..fd5a713 --- /dev/null +++ b/pgweb/security/struct.py @@ -0,0 +1,9 @@ +from datetime import date, timedelta +from .models import SecurityPatch + + +def get_struct(): + """create sitemap entries for each CVE entry and the top level CVE URL""" + yield ('support/security/', None) + for s in SecurityPatch.objects.filter(public=True).order_by('-cvenumber'): + yield ('support/security/CVE-{}'.format(s.cve), None) diff --git a/pgweb/security/views.py b/pgweb/security/views.py index 0a7f204..1ce2ed8 100644 --- a/pgweb/security/views.py +++ b/pgweb/security/views.py @@ -1,9 +1,11 @@ -from django.shortcuts import get_object_or_404 +from django.core.validators import ValidationError +from django.http import Http404 +from django.shortcuts import get_object_or_404, redirect from pgweb.util.contexts import render_pgweb from pgweb.core.models import Version -from .models import SecurityPatch +from .models import SecurityPatch, make_cvenumber def GetPatchesList(filt): @@ -22,6 +24,33 @@ def _list_patches(request, filt): }) +def details(request, cve_prefix, cve): + """Provides additional details about a specific CVE""" + # First determine if the entrypoint of the URL is a lowercase "cve". If it + # is, redirect to the uppercase + if cve_prefix == "cve": + return redirect('/support/security/CVE-{}/'.format(cve), permanent=True) + # Get the CVE number from the CVE ID string so we can look it up + # against the database. This shouldn't fail due to an ill-formatted CVE, + # as both use the same validation check, but we will wrap it just in case. + # + # However, we do need to ensure that the CVE does both exist and + # is published. + try: + security_patch = get_object_or_404( + SecurityPatch, + cvenumber=make_cvenumber(cve), + public=True, + ) + except ValidationError: + raise Http404() + + return render_pgweb(request, 'support', 'security/details.html', { + 'security_patch': security_patch, + 'versions': security_patch.securitypatchversion_set.select_related('version').order_by('-version__tree').all(), + }) + + def index(request): # Show all supported versions return _list_patches(request, "v.supported") diff --git a/pgweb/urls.py b/pgweb/urls.py index 64fb616..cc29aab 100644 --- a/pgweb/urls.py +++ b/pgweb/urls.py @@ -81,6 +81,7 @@ urlpatterns = [ url(r'^support/security/$', pgweb.security.views.index), url(r'^support/security/(\d\.\d|\d{2})/$', pgweb.security.views.version), + url(r'^support/security/(?PCVE|cve)-(?P\d{4}-\d{4,7})/$', pgweb.security.views.details), url(r'^support/security_archive/$', RedirectView.as_view(url='/support/security/', permanent=True)), url(r'^support/professional_(support|hosting)/$', pgweb.profserv.views.root), diff --git a/templates/security/details.html b/templates/security/details.html new file mode 100644 index 0000000..0e894c5 --- /dev/null +++ b/templates/security/details.html @@ -0,0 +1,95 @@ +{%extends "base/page.html"%} +{%block title%}CVE-{{ security_patch.cve }}: {{ security_patch.description }}{%endblock%} +{%block contents%} + +

CVE-{{ security_patch.cve }}

+

{{ security_patch.description }}

+ +{% if security_patch.details %} +

{{ security_patch.details }}

+{% endif %} + +

Version Information

+ + + + + + + {% if security_patch.newspost %} + + {% endif %} + + + {% for version in versions %} + + + + {% if security_patch.newspost %} + + {% endif %} + + {% endfor %} + +
Affected VersionFixed InFix Published
+ {% if version.version.tree >= 10 %} + {{ version.version.tree|floatformat:"0" }} + {% else %} + {{ version.version.tree }} + {% endif %} + + + {% if version.version.tree >= 10 %} + {{ version.version.tree|floatformat:"0" }}.{{ version.fixed_minor }} + {% else %} + {{ version.version.tree }}.{{ version.fixed_minor }} + {% endif %} + + + + {{ security_patch.newspost.date }} + +
+ +

+ For more information about PostgreSQL versioning, + please visit the versioning page. +

+ +{% if security_patch.cvssscore >= 0 %} +

CVSS 3.0

+ + + + + + + + + + + + + + + + +
Overall Score{{ security_patch.cvssscore }}
Component{{ security_patch.component }}
Vector + + {{ security_patch.cvssvector }} + +
+{% endif %} + +

Reporting Security Vulnerabilities

+ +

+ If you wish to report a new security vulnerability in PostgreSQL, please + send an email to + security@postgresql.org. +

+ +

+ For reporting non-security bugs, please see the Report a Bug page. +

+{%endblock%} diff --git a/templates/security/security.html b/templates/security/security.html index a6e0a6f..13fcc16 100644 --- a/templates/security/security.html +++ b/templates/security/security.html @@ -75,7 +75,7 @@ You can filter the view of patches to show just patches for version:
{%for p in patches%} - {%if p.cve%}{%if p.cve_visible%}CVE-{{p.cve}}{%else%}CVE-{{p.cve}}{%endif%}
{%endif%} + {%if p.cve%}CVE-{{p.cve}}
{%endif%} {%if p.newspost%}Announcement
{%endif%} {{p.affected|join:", "}} @@ -83,7 +83,7 @@ You can filter the view of patches to show just patches for version:
{{p.component}}
{%if p.cvssscore >= 0%}{{p.cvssscore}}
{{p.cvssvector}} {%else%}Legacy: {{p.legacyscore}}{%endif%} - {{p.description}}{%if p.detailslink%}

more details{%endif%} + {{p.description}}

more details {% endfor %} -- 2.21.1 (Apple Git-122.3)